Auto merge of #1844 - steveklabnik:gh1407, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 27 Jul 2015 19:16:34 +0000 (19:16 +0000)
committerbors <bors@rust-lang.org>
Mon, 27 Jul 2015 19:16:34 +0000 (19:16 +0000)
commitcdce190e1f5cb72498566f2443159ebd030441c1
tree15aa89e462bee6332540e5c1adc064dc0af04e01
parent7bdf42f3d5d704ba8a7b41c9ea5a32c019e70900
parent4de57746437dc3882f9f618d95981f83763f6224
Auto merge of #1844 - steveklabnik:gh1407, r=alexcrichton

Fixes #1407